update hunks.

diff --git a/debian/patches/0003-Use-release-version-for-Debian.patch b/debian/patches/0003-Use-release-version-for-Debian.patch
index 35381791f285a870e231b3f9c85c7c7b20716087..38f11e54c0b007e0c90b33ec6e5b97c85e918de4 100644 (file)
--- a/debian/patches/0003-Use-release-version-for-Debian.patch
+++ b/debian/patches/0003-Use-release-version-for-Debian.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
  1 file changed, 5 insertions(+)
 
 diff --git a/VERSION.cmake b/VERSION.cmake
-index 8e9ac37..acfa1c7 100644
+index dd96a86..b41828b 100644
 --- a/VERSION.cmake
 +++ b/VERSION.cmake
 @@ -66,3 +66,8 @@ endif()

diff --git a/debian/patches/0006-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch b/debian/patches/0006-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
index 6300e470a90dfdcc0a2375a3b385bbd5a35ee265..728c5453111dbf7d6f792b5e2a35785585af7ada 100644 (file)
--- a/debian/patches/0006-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
+++ b/debian/patches/0006-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
@@ -56,10 +56,10 @@ index 8f319a3..55cd0f0 100644
    return 0;
  }
 diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
-index 5d2ab48..840b433 100644
+index c95af63..39c65a2 100644
 --- a/src/libsync/discovery.cpp
 +++ b/src/libsync/discovery.cpp
-@@ -1127,10 +1127,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
+@@ -1130,10 +1130,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
          if (_queryLocal != NormalQuery && _queryServer != NormalQuery)
              recurse = false;
  
@@ -70,7 +70,7 @@ index 5d2ab48..840b433 100644
          if ((item->_direction == SyncFileItem::Down || item->_instruction == CSYNC_INSTRUCTION_CONFLICT || item->_instruction == CSYNC_INSTRUCTION_NEW || item->_instruction == CSYNC_INSTRUCTION_SYNC) &&
                  item->_direction != SyncFileItem::Up &&
                  (item->_modtime <= 0 || item->_modtime >= 0xFFFFFFFF)) {
-@@ -1159,13 +1155,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
+@@ -1162,13 +1158,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
              }
          }
  
@@ -82,8 +82,8 @@ index 5d2ab48..840b433 100644
 -        item->isPermissionsInvalid = localEntry.isPermissionsInvalid;
 -
          auto recurseQueryLocal = _queryLocal == ParentNotChanged ? ParentNotChanged : localEntry.isDirectory || item->_instruction == CSYNC_INSTRUCTION_RENAME ? NormalQuery : ParentDontExist;
-         processFileFinalize(item, path, recurse, recurseQueryLocal, recurseQueryServer);
-     };
+         if (item->isDirectory() && serverEntry.isValid() && dbEntry.isValid() && serverEntry.etag == dbEntry._etag && serverEntry.remotePerm != dbEntry._remotePerm) {
+             recurseQueryServer = ParentNotChanged;
 diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
 index 7edd684..f881a21 100644
 --- a/src/libsync/discoveryphase.cpp